# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1063.1.21 -> 1.1063.1.22 # drivers/char/serial.c 1.41 -> 1.42 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/09/08 bjorn.helgaas@hp.com 1.1087 # Merge hp.com:/home/helgaas/linux/ia64-extras # into hp.com:/home/helgaas/linux/linux-ia64-2.4 # -------------------------------------------- # 03/09/08 bjorn.helgaas@hp.com 1.1063.1.22 # SERIAL: Clean up acpi_bus.h include path. # -------------------------------------------- # diff -Nru a/drivers/char/serial.c b/drivers/char/serial.c --- a/drivers/char/serial.c Wed Oct 8 09:06:26 2003 +++ b/drivers/char/serial.c Wed Oct 8 09:06:26 2003 @@ -223,7 +223,7 @@ #endif #ifdef ENABLE_SERIAL_ACPI #include -#include "../acpi/acpi_bus.h" +#include #endif /*